Compare commits

..

No commits in common. "b754fac210373e3c5be345e9c290c9baacec3d82" and "21f90a84badbc7ceeee0f46aa088c69638f08145" have entirely different histories.

22 changed files with 161 additions and 235 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 401 KiB

View File

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743325743, "lastModified": 1742644875,
"narHash": "sha256-p2ZlFUBy10SV0b2g8ZOWse01mgaeU4haZN+dgHcoN6U=", "narHash": "sha256-AJH2wgat6ssid3oYb0KBgO4qxhZD6/OWNHwYj11Yfy4=",
"owner": "AdnanHodzic", "owner": "AdnanHodzic",
"repo": "auto-cpufreq", "repo": "auto-cpufreq",
"rev": "00be2a5d91832519823990deb7b87af85fc78017", "rev": "8f026ac6497050c0e07c55b751c4b80401e932ec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1743483509, "lastModified": 1742489760,
"narHash": "sha256-aHnOrBV4UpVQuv9RHmYaRb0jZRBpmeDWsZWBRoSCc5w=", "narHash": "sha256-OkYl/wf09cKviSV1R6SshcRmeX1iDNEKCMg5KlmTwK0=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "692aba39210127804151c9436e4b87fe1d0e0f2b", "rev": "10f7b577f5081b30ca6b7fd5f98de8d7dfdb5a27",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -209,11 +209,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1741352980, "lastModified": 1738453229,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -408,11 +408,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743482579, "lastModified": 1742744903,
"narHash": "sha256-u81nqA4UuRatKDkzUuIfVYdLMw8birEy+99oXpdyXhY=", "narHash": "sha256-qd2uiGol/kb9Dk0vgOOLBl9VsycG0VfteM78OduFl2Y=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c21383b556609ce1ad901aa08b4c6fbd9e0c7af0", "rev": "5ff90f09d1bd189b722e60798513724cdd3580b6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -539,11 +539,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1743463509, "lastModified": 1742746774,
"narHash": "sha256-JASYdXTJovrTgT04ATMGpRruvY4+lrdhAkoPhPPb+h4=", "narHash": "sha256-6BMwAfC604szlL8S7BJkH8a090p0505rFB+mAiApBoo=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "d1a59ec39eb4c0d6a7d3d38a26f8924e6bca5cef", "rev": "e4abf26069b4d43c8f6ad6b3dfb56c952abb38c2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -746,11 +746,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1742255973, "lastModified": 1738852285,
"narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=", "narHash": "sha256-8Y1uyE6gGHxdU0Vcx2CMg/dAmDSxJw19aAl3TKbbo54=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d", "rev": "6ae73dc9cb72cea17bcc2e3d4670825f483e80e8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -774,11 +774,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1741118843, "lastModified": 1732053863,
"narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=", "narHash": "sha256-DCIVdlb81Fct2uwzbtnawLBC/U03U2hqx8trqTJB7WA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "577d160da311cc7f5042038456a0713e9863d09e", "rev": "2e24c9834e3bb5aa2a3701d3713b43a6fb106362",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -817,11 +817,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743410259, "lastModified": 1742204505,
"narHash": "sha256-tjdkPPkRT1Mj72yrpN8oUxYw9SaG8wOQWD3auS1bvSs=", "narHash": "sha256-sHBzuG9K/VrvOrcLd9GwoCLaQZDVedi/00YmFfdKq/A=",
"owner": "Mic92", "owner": "Mic92",
"repo": "nix-ld", "repo": "nix-ld",
"rev": "140451db1cadeef1e7e9e054332b67b7be808916", "rev": "bc1ecb8ca83507c764a3909f02f1acf53c033585",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -833,11 +833,11 @@
"nix-mineral": { "nix-mineral": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742784395, "lastModified": 1741139493,
"narHash": "sha256-QBaHKDrJ2aXGR9/UjAXeTIQfcguSJRO5D4oWd2s3zIg=", "narHash": "sha256-O8ANa90YDk1kMoPhLWioXVGy19pkvSg1F6prp2XSy7U=",
"owner": "cynicsketch", "owner": "cynicsketch",
"repo": "nix-mineral", "repo": "nix-mineral",
"rev": "561cf46483c9758c2b5bef75bc05762326ae9b5d", "rev": "546b89e5a9b15584c1324deaea66bff0801ab743",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -884,11 +884,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1743761374, "lastModified": 1742580728,
"narHash": "sha256-Zzhd3KRkG2cR4I3ExSJr4V1RV8d7TomaBEoT9g9hbYg=", "narHash": "sha256-SyhAnd66UwtisdTOen13K5iSRkp/H+/w9tYH8c4AGKc=",
"owner": "kaylorben", "owner": "kaylorben",
"repo": "nixcord", "repo": "nixcord",
"rev": "48e192d4592a6c33e596fdc127e5025bee53bf3d", "rev": "b5f200ebbc880dd69ce06a9cd442fc758f426f87",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -899,16 +899,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743315132, "lastModified": 1735554305,
"narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "narHash": "sha256-zExSA1i/b+1NMRhGGLtNfFGXgLtgo+dcuzHzaWA6w3Q=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "52faf482a3889b7619003c0daec593a1912fddc1", "rev": "0e82ab234249d8eee3e8c91437802b32c74bb3fd",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -963,26 +963,23 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1740877520, "lastModified": 1738452942,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=", "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"owner": "nix-community", "type": "tarball",
"repo": "nixpkgs.lib", "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
"type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "type": "tarball",
"repo": "nixpkgs.lib", "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1743367904, "lastModified": 1742512142,
"narHash": "sha256-sOos1jZGKmT6xxPvxGQyPTApOunXvScV4lNjBCXd/CI=", "narHash": "sha256-8XfURTDxOm6+33swQJu/hx6xw1Tznl8vJJN5HwVqckg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7ffe0edc685f14b8c635e3d6591b0bbb97365e6c", "rev": "7105ae3957700a9646cc4b766f5815b23ed0c682",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -994,11 +991,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1743076231, "lastModified": 1742422364,
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=", "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6c5963357f3c1c840201eda129a99d455074db04", "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": {
"lastModified": 1740303746,
"narHash": "sha256-XcdiWLEhjJkMxDLKQJ0CCivmYYCvA5MDxu9pMybM5kM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "2d068ae5c6516b2d04562de50a58c682540de9bf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1046,6 +1059,22 @@
"type": "sourcehut" "type": "sourcehut"
} }
}, },
"nmd_3": {
"flake": false,
"locked": {
"lastModified": 1705050560,
"narHash": "sha256-x3zzcdvhJpodsmdjqB4t5mkVW22V3wqHLOun0KRBzUI=",
"owner": "~rycee",
"repo": "nmd",
"rev": "66d9334933119c36f91a78d565c152a4fdc8d3d3",
"type": "sourcehut"
},
"original": {
"owner": "~rycee",
"repo": "nmd",
"type": "sourcehut"
}
},
"nmt": { "nmt": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -1091,15 +1120,16 @@
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"mnw": "mnw", "mnw": "mnw",
"nil": "nil", "nil": "nil",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nmd": "nmd_3",
"systems": "systems_4" "systems": "systems_4"
}, },
"locked": { "locked": {
"lastModified": 1743613645, "lastModified": 1740702856,
"narHash": "sha256-QnwkxbdE5raf5enqZQAY+QZ+awisTD2YCReO0iL4CGg=", "narHash": "sha256-NxVK4PUdcuwzaAQX1Xj2tMaowDLqL5p8wtWp3EyD0Vw=",
"owner": "notashelf", "owner": "notashelf",
"repo": "nvf", "repo": "nvf",
"rev": "dafe978ffa5277519de010cdfca8225c52c9d2aa", "rev": "08be38ab06c95f56cb9d27805826c1b1d0ffac98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1118,11 +1148,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742765550, "lastModified": 1740569341,
"narHash": "sha256-2vVIh2JrL6GAGfgCeY9e6iNKrBjs0Hw3bGQEAbwVs68=", "narHash": "sha256-WV8nY2IOfWdzBF5syVgCcgOchg/qQtpYh6LECYS9XkY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "plasma-manager", "repo": "plasma-manager",
"rev": "b70be387276e632fe51232887f9e04e2b6ef8c16", "rev": "5eeb0172fb74392053b66a8149e61b5e191b2845",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1141,11 +1171,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742649964, "lastModified": 1742058297,
"narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "narHash": "sha256-b4SZc6TkKw8WQQssbN5O2DaCEzmFfvSTPYHlx/SFW9Y=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "rev": "59f17850021620cd348ad2e9c0c64f4e6325ce2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1166,7 +1196,7 @@
"nix-mineral": "nix-mineral", "nix-mineral": "nix-mineral",
"nix-on-droid": "nix-on-droid", "nix-on-droid": "nix-on-droid",
"nixcord": "nixcord", "nixcord": "nixcord",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs_2",
"nixpkgs-droid": "nixpkgs-droid", "nixpkgs-droid": "nixpkgs-droid",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"plasma-manager": "plasma-manager", "plasma-manager": "plasma-manager",
@ -1187,11 +1217,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1741055476, "lastModified": 1731983527,
"narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=", "narHash": "sha256-JECaBgC0pQ91Hq3W4unH6K9to8s2Zl2sPNu7bLOv4ek=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "aefb7017d710f150970299685e8d8b549d653649", "rev": "71287228d96e9568e1e70c6bbfa3f992d145947b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1224,11 +1254,11 @@
"nvf": "nvf" "nvf": "nvf"
}, },
"locked": { "locked": {
"lastModified": 1743618481, "lastModified": 1740750664,
"narHash": "sha256-mnaJPjMmwcBnPXP8AkLt7AETnm7VLXHEajnGrIUJt88=", "narHash": "sha256-7VIr6eaSK9sgIUUjDCmytxTkEV0olcmw1IhC1EQkYYE=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "cc32d846b797b7a637125422d5754bf804d570ab", "rev": "b340d4c1ba887eb6f68f2850063d0708cc1c7537",
"revCount": 9, "revCount": 8,
"type": "git", "type": "git",
"url": "https://git.foglar.tech/foglar/neovim-config" "url": "https://git.foglar.tech/foglar/neovim-config"
}, },
@ -1244,11 +1274,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743305778, "lastModified": 1742700801,
"narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", "narHash": "sha256-ZGlpUDsuBdeZeTNgoMv+aw0ByXT2J3wkYw9kJwkAS4M=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "8e873886bbfc32163fe027b8676c75637b7da114", "rev": "67566fe68a8bed2a7b1175fdfb0697ed22ae8852",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1265,11 +1295,11 @@
"systems": "systems_5" "systems": "systems_5"
}, },
"locked": { "locked": {
"lastModified": 1743308176, "lastModified": 1742703429,
"narHash": "sha256-xiHVIJsxj3tknObHzfKsWHQ0N38zyFsb8edB3oXDOxg=", "narHash": "sha256-/07c78WpRta925dyZEhwQi+D+rd+zVoDPApur+907p4=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "spicetify-nix", "repo": "spicetify-nix",
"rev": "567e5b6ee6d7433261f16b400e424a6bd5c8c8b3", "rev": "d86aca850354c8db834c20feb170356e3d28a5c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1302,11 +1332,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1743775855, "lastModified": 1742736315,
"narHash": "sha256-ZhhiYvHlA9f/Ck1i76ilfapLS7abLPRlWJQRxJEDTnQ=", "narHash": "sha256-XO+dWWoWer/YyczQeff3Onr3P0q7SxoKltndBrzRdTg=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "581fa67c818aaf91a1533149fb737d3e8c0949b8", "rev": "a55488c247928380ee6a18c0a3a56a2d52fe06bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1488,17 +1518,14 @@
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixcord",
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1742370146, "lastModified": 1739829690,
"narHash": "sha256-XRE8hL4vKIQyVMDXykFh4ceo3KSpuJF3ts8GKwh5bIU=", "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "adc195eef5da3606891cedf80c0d9ce2d3190808", "rev": "3d0579f5cc93436052d94b73925b48973a104204",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1577,11 +1604,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743463070, "lastModified": 1742736106,
"narHash": "sha256-x+A6Es0VkGyhp4ixhqg1Qi9iusLl7ioymqoe107L/Dg=", "narHash": "sha256-wzdYoYASPlITYBiw2xDyE56DnOcLNsO6QHRGUDj6kq4=",
"owner": "0xc000022070", "owner": "0xc000022070",
"repo": "zen-browser-flake", "repo": "zen-browser-flake",
"rev": "3c4f98e9504d3f94bbd303d428162665a0ade8d6", "rev": "7c3008fcc5a436c885d3faaf6d058afc41ae3762",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -16,7 +16,7 @@
editor = "neovim"; # neovim, vscode editor = "neovim"; # neovim, vscode
# List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes # List all themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
theme = "catppuccin-mocha"; # catppuccin-mocha, tokyo-night-dark, one-dark theme = "tokyo-night-dark"; # catppuccin-mocha, tokyo-night-dark, one-dark
background = background =
if userSettings.theme == "catppuccin-mocha" if userSettings.theme == "catppuccin-mocha"
then "aurora_borealis.png" then "aurora_borealis.png"
@ -59,7 +59,7 @@
# NixOS Configurations # NixOS Configurations
nixosConfigurations = { nixosConfigurations = {
kogami = nixpkgs.lib.nixosSystem { kogami = nixpkgs.lib.nixosSystem {
inherit system; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs system pkgs pkgs-stable userSettings; inherit inputs system pkgs pkgs-stable userSettings;
}; };
@ -74,7 +74,7 @@
]; ];
}; };
ginoza = nixpkgs.lib.nixosSystem { ginoza = nixpkgs.lib.nixosSystem {
inherit system; system = "x86_64-linux";
specialArgs = { specialArgs = {
inherit inputs system pkgs pkgs-stable userSettings; inherit inputs system pkgs pkgs-stable userSettings;
}; };
@ -179,12 +179,6 @@
flake = false; flake = false;
}; };
#nix-secrets = {
# url = "git+ssh://git@git.foglar.tech:foglar/nix-secrets.git";
# inputs.nixpkgs.follows = "nixpkgs";
# flake = false;
#};
# Nix on Droid Configuration # Nix on Droid Configuration
nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05";

View File

@ -12,6 +12,7 @@
../nixos/system/system.nix ../nixos/system/system.nix
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];
# Home manager # Home manager
home-manager = { home-manager = {
@ -61,7 +62,6 @@
docker.enable = false; docker.enable = false;
podman.enable = false; podman.enable = false;
steam.enable = false; steam.enable = false;
steam-tui.enable = false;
proxychains.enable = false; proxychains.enable = false;
tor.enable = false; tor.enable = false;
virt-manager.enable = false; virt-manager.enable = false;

View File

@ -36,6 +36,7 @@
#bootloader.systemd-boot.enable = true; #bootloader.systemd-boot.enable = true;
desktop = { desktop = {
hyprland.enable = true; hyprland.enable = true;
gnome.enable = true;
steamdeck.enable = false; steamdeck.enable = false;
}; };
fonts.packages = true; fonts.packages = true;
@ -68,12 +69,10 @@
podman.enable = true; podman.enable = true;
ollama.enable = false; ollama.enable = false;
steam.enable = true; steam.enable = true;
steam-tui.enable = true;
proxychains.enable = true; proxychains.enable = true;
tor.enable = true; tor.enable = true;
virt-manager.enable = true; virt-manager.enable = true;
virtualbox.enable = false; virtualbox.enable = false;
waydroid.enable = true;
yubikey = { yubikey = {
enable = true; enable = true;
lock-on-remove = false; lock-on-remove = false;
@ -93,23 +92,16 @@
nix-ld.dev.enable = true; nix-ld.dev.enable = true;
}; };
environment.systemPackages = environment.systemPackages = [
( inputs.install-script.packages.${system}.default
with inputs; [ inputs.shinya-nvf.packages.${system}.nvf
install-script.packages.${system}.default inputs.zen-browser.packages.${system}.default
shinya-nvf.packages.${system}.nvf
zen-browser.packages.${system}.default
]
)
++ (
with pkgs; [
gcc
corefonts
uutils-coreutils-noprefix
]
);
#services.twingate.enable = true; pkgs.gcc
pkgs.corefonts
];
#services.twingate.enable = true;
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View File

@ -17,7 +17,6 @@
ferdium ferdium
bitwarden bitwarden
proton-pass
#bitwarden-cli #bitwarden-cli
file-roller file-roller

View File

@ -464,8 +464,6 @@
"float,class:^(Bitwarden)$" "float,class:^(Bitwarden)$"
"float, initialClass:^(PacketTracer)" "float, initialClass:^(PacketTracer)"
"float, initialTitle:^(Open File)"
"float, initialClass:^(xdg-desktop-portal-gtk)"
]; ];
layerrule = [ layerrule = [

View File

@ -95,16 +95,16 @@
get_cover() { get_cover() {
DOWNLOAD_PATH="$HOME/.cache/cover.png" DOWNLOAD_PATH="$HOME/.cache/cover.png"
FALLBACK_PATH="./images/music.png" # Change this to your static image path FALLBACK_PATH="./images/music.png" # Change this to your static image path
# Get the image URL from playerctl # Get the image URL from playerctl
URL=$(playerctl metadata mpris:artUrl 2>/dev/null) URL=$(playerctl metadata mpris:artUrl 2>/dev/null)
# If the URL is empty or playerctl fails, return the fallback path # If the URL is empty or playerctl fails, return the fallback path
if [[ -z "$URL" ]]; then if [[ -z "$URL" ]]; then
echo "$FALLBACK_PATH" echo "$FALLBACK_PATH"
return return
fi fi
# Try downloading the image # Try downloading the image
if curl -s -o "$DOWNLOAD_PATH" "$URL"; then if curl -s -o "$DOWNLOAD_PATH" "$URL"; then
echo "$DOWNLOAD_PATH" echo "$DOWNLOAD_PATH"
@ -116,7 +116,7 @@
get_watched_length() { get_watched_length() {
total_length=$(playerctl metadata --format "{{ duration(mpris:length) }}" | awk -F: '{ print ($1 * 60) + $2 }') total_length=$(playerctl metadata --format "{{ duration(mpris:length) }}" | awk -F: '{ print ($1 * 60) + $2 }')
current_position=$(playerctl metadata --format "{{ duration(position) }}" | awk -F: '{ print ($1 * 60) + $2 }') current_position=$(playerctl metadata --format "{{ duration(position) }}" | awk -F: '{ print ($1 * 60) + $2 }')
if [[ "$total_length" -gt 0 ]]; then if [[ "$total_length" -gt 0 ]]; then
percentage=$(awk "BEGIN { printf \"%.2f\", ($current_position / $total_length) * 100 }") percentage=$(awk "BEGIN { printf \"%.2f\", ($current_position / $total_length) * 100 }")
echo "$percentage" echo "$percentage"
@ -275,7 +275,7 @@
label = [ label = [
{ {
monitor = ""; monitor = "";
text = "$TIME"; text = "$TIME ";
color = "$text"; color = "$text";
font_size = 12; font_size = 12;
@ -342,11 +342,11 @@
#{ #{
# monitor = ""; # monitor = "";
# text = "cmd[update:1000] playerctl-hyprlock --status-symbol"; # text = "cmd[update:1000] playerctl-hyprlock --status-symbol";
# #
# color = "$fg0"; # color = "$fg0";
# font_size = 16; # font_size = 16;
# font_family = "$font-symbol"; # font_family = "$font-symbol";
# #
# position = "700, -370"; # position = "700, -370";
# halign = "left"; # halign = "left";
# valign = "bottom"; # valign = "bottom";

View File

@ -200,9 +200,6 @@
"[css]" = { "[css]" = {
"editor.defaultFormatter" = "esbenp.prettier-vscode"; "editor.defaultFormatter" = "esbenp.prettier-vscode";
}; };
"[scss]" = {
"editor.defaultFormatter" = "esbenp.prettier-vscode";
};
}; };
extensions = with pkgs-stable.vscode-extensions; [ extensions = with pkgs-stable.vscode-extensions; [

View File

@ -13,7 +13,7 @@
programs.git = { programs.git = {
enable = true; enable = true;
userName = "${userSettings.username}"; userName = "${userSettings.username}";
userEmail = "sigma@goon.cz"; userEmail = "kohout.fi.2023@skola.ssps.cz";
lfs.enable = true; lfs.enable = true;
}; };

View File

@ -24,14 +24,8 @@
if userSettings.theme == "evangelion-blood" || userSettings.theme == "tokyo-night-dark" if userSettings.theme == "evangelion-blood" || userSettings.theme == "tokyo-night-dark"
then { then {
"source" = "/home/shinya/.config/fastfetch/logo.png"; "source" = "/home/shinya/.config/fastfetch/logo.png";
"width" = "width" = 42;
if userSettings.theme == "evangelion-blood" "height" = 19;
then 34
else 42;
"height" =
if userSettings.theme == "evangelion-blood"
then 18
else 19;
"padding" = { "padding" = {
"top" = 1; "top" = 1;
}; };
@ -123,6 +117,10 @@
"key" = "{#separator} {#keys}󰋊 Disk (/)"; "key" = "{#separator} {#keys}󰋊 Disk (/)";
"folders" = "/"; "folders" = "/";
} }
{
"type" = "custom";
"format" = "{#1}";
}
{ {
"type" = "custom"; "type" = "custom";
"format" = "{#1}"; "format" = "{#1}";

View File

@ -11,7 +11,7 @@
l = "${pkgs.eza}/bin/eza -lh --icons=auto"; l = "${pkgs.eza}/bin/eza -lh --icons=auto";
tree = "${pkgs.eza}/bin/eza --tree --icons"; tree = "${pkgs.eza}/bin/eza --tree --icons";
neofetch = "${pkgs.fastfetch}/bin/fastfetch"; neofetch = "${pkgs.fastfetch}/bin/fastfetch";
open = "xdg-open"; open ="xdg-open";
ip = "ip -c"; ip = "ip -c";
s = "kitten ssh"; s = "kitten ssh";
icat = "kitten icat"; icat = "kitten icat";
@ -41,10 +41,8 @@ in {
bashrcExtra = bashrcExtra =
if userSettings.hostname != "ginoza" if userSettings.hostname != "ginoza"
then '' then ''${pkgs.pfetch}/bin/pfetch''
TERM=xterm-256color else '''';
${pkgs.pfetch}/bin/pfetch''
else ''TERM=xterm-256color'';
}; };
home.sessionVariables = { home.sessionVariables = {
@ -64,9 +62,7 @@ in {
initExtra = '' initExtra = ''
${pkgs.pfetch}/bin/pfetch ${pkgs.pfetch}/bin/pfetch
set -o emacs set -o emacs
bindkey "^[[3~" delete-char bindkey "^[[3~" delete-char'';
TERM=xterm-256color
'';
}; };
}) })
]; ];

View File

@ -20,21 +20,17 @@
wakapi.enable = lib.mkDefault true; wakapi.enable = lib.mkDefault true;
ollama.enable = lib.mkDefault false; ollama.enable = lib.mkDefault false;
steam.enable = lib.mkDefault true; steam.enable = lib.mkDefault true;
steam-tui.enable = lib.mkDefault false;
proxychains.enable = lib.mkDefault true; proxychains.enable = lib.mkDefault true;
tor.enable = lib.mkDefault true; tor.enable = lib.mkDefault true;
virt-manager.enable = lib.mkDefault true; virt-manager.enable = lib.mkDefault true;
virtualbox.enable = lib.mkDefault true; virtualbox.enable = lib.mkDefault true;
waydroid.enable = lib.mkDefault false;
yubikey = { yubikey = {
enable = lib.mkDefault false; enable = lib.mkDefault false;
lock-on-remove = lib.mkDefault false; lock-on-remove = lib.mkDefault false;
notify = lib.mkDefault false; notify = lib.mkDefault false;
}; };
ssh = { ssh.client.enable = lib.mkDefault true;
client.enable = lib.mkDefault true; ssh.server.enable = lib.mkDefault false;
server.enable = lib.mkDefault false;
};
syncthing.enable = lib.mkDefault true; syncthing.enable = lib.mkDefault true;
}; };

View File

@ -37,20 +37,6 @@
owner = userSettings.username; owner = userSettings.username;
group = "users"; group = "users";
}; };
# git.hater.dev
"ssh_keys/hater_private" = {
path = "/home/${userSettings.username}/.ssh/id_shinya3";
owner = userSettings.username;
group = "users";
};
# gitea.homework.zip
"ssh_keys/homework_private" = {
path = "/home/${userSettings.username}/.ssh/id_homework";
owner = userSettings.username;
group = "users";
};
"wakapi/salt" = { "wakapi/salt" = {
owner = userSettings.username; owner = userSettings.username;

View File

@ -13,14 +13,10 @@
HostName 192.168.8.140 HostName 192.168.8.140
User foglar User foglar
IdentityFile ~/.ssh/id_masaoka IdentityFile ~/.ssh/id_masaoka
Host hater Host git
HostName git.hater.dev HostName git.hater.dev
User foglar User foglar
IdentityFile ~/.ssh/id_shinya3 IdentityFile ~/.ssh/id_shinya3
Host homework
Hostname gitea.homework.zip
User shinya
IdentityFile ~/.ssh/id_github
''; '';
}; };
}; };

View File

@ -7,8 +7,6 @@
}: { }: {
options = { options = {
program.steam.enable = lib.mkEnableOption "Enable Steam module"; program.steam.enable = lib.mkEnableOption "Enable Steam module";
program.steam-tui.enable = lib.mkEnableOption "Enable Steam TUI";
sys.desktop.steamdeck.enable = lib.mkEnableOption "Enable Steam desktop integration"; sys.desktop.steamdeck.enable = lib.mkEnableOption "Enable Steam desktop integration";
}; };
@ -31,8 +29,5 @@
''; '';
}; };
}) })
(lib.mkIf config.program.steam-tui.enable {
environment.systemPackages = with pkgs; [steam-tui steamcmd];
})
]; ];
} }

View File

@ -12,30 +12,8 @@
(lib.mkIf config.program.tor.enable { (lib.mkIf config.program.tor.enable {
services.tor = { services.tor = {
enable = true; enable = true;
# ** This block exposes your service to the tor network **
# ** Change the port and target to your service **
# ** Get the onion address from /var/lib/tor/[myOnion]/hostname **
#enableGeoIP = false;
#relay.onionServices = {
#myOnion = {
# version = 3;
# map = [
# {
# port = 80;
# target = {
# addr = "127.0.0.1";
# port = 3000;
# };
# }
# ];
#};
#};
#settings = {
# ClientUseIPv4 = true;
# ClientUseIPv6 = false;
# ClientPreferIPv6ORPort = false;
#};
}; };
services.tor.client.enable = true;
}) })
(lib.mkIf config.program.proxychains.enable { (lib.mkIf config.program.proxychains.enable {
programs.proxychains = { programs.proxychains = {

View File

@ -7,7 +7,6 @@
options = { options = {
program.virt-manager.enable = lib.mkEnableOption "Enable virt-manager"; program.virt-manager.enable = lib.mkEnableOption "Enable virt-manager";
program.virtualbox.enable = lib.mkEnableOption "Enable VirtualBox"; program.virtualbox.enable = lib.mkEnableOption "Enable VirtualBox";
program.waydroid.enable = lib.mkEnableOption "Enable Waydroid";
}; };
config = lib.mkMerge [ config = lib.mkMerge [
(lib.mkIf config.program.virt-manager.enable { (lib.mkIf config.program.virt-manager.enable {
@ -25,8 +24,5 @@
}; };
users.extraGroups.vboxusers.members = ["${userSettings.username}"]; users.extraGroups.vboxusers.members = ["${userSettings.username}"];
}) })
(lib.mkIf config.program.waydroid.enable {
virtualisation.waydroid.enable = true;
})
]; ];
} }

View File

@ -15,18 +15,13 @@
}; };
config = lib.mkIf config.sys.default-applications.enable { config = lib.mkIf config.sys.default-applications.enable {
environment.sessionVariables = let environment.sessionVariables = {
editor-bin =
if userSettings.editor == "neovim"
then "nvim"
else userSettings.editor;
in {
DEFAULT_BROWSER = DEFAULT_BROWSER =
if userSettings.browser != "zen" if userSettings.browser != "zen"
then "${pkgs."${userSettings.browser}"}/bin/${userSettings.browser}" then "${pkgs."${userSettings.browser}"}/bin/${userSettings.browser}"
else "zen"; else "zen";
TERMINAL = "${pkgs."${userSettings.terminal}"}/bin/${userSettings.terminal}"; TERMINAL = "${pkgs."${userSettings.terminal}"}/bin/${userSettings.terminal}";
EDITOR = "${pkgs."${userSettings.editor}"}/bin/${editor-bin}"; EDITOR = "${pkgs."${userSettings.editor}"}/bin/${userSettings.editor}";
FLAKE = "/home/${userSettings.username}/.dotfiles"; FLAKE = "/home/${userSettings.username}/.dotfiles";
}; };

View File

@ -53,8 +53,8 @@
# Enable the Nvidia settings menu, # Enable the Nvidia settings menu,
# accessible via `nvidia-settings`. # accessible via `nvidia-settings`.
nvidiaSettings = true; nvidiaSettings = true;
prime.amdgpuBusId = "PCI:4:0:0"; prime.amdgpuBusId = "pci@000:04:0";
prime.nvidiaBusId = "PCI:1:0:0"; prime.nvidiaBusId = "pci@000:01:0";
# Optionally, you may need to select the appropriate driver version for your specific GPU. # Optionally, you may need to select the appropriate driver version for your specific GPU.
package = config.boot.kernelPackages.nvidiaPackages.stable; package = config.boot.kernelPackages.nvidiaPackages.stable;
}; };

View File

@ -30,7 +30,7 @@
# Scanning # Scanning
hardware.sane.enable = true; hardware.sane.enable = true;
services.ipp-usb.enable = true; services.ipp-usb.enable = true;
hardware.sane.extraBackends = [pkgs.hplipWithPlugin]; #hardware.sane.extraBackends = [pkgs.hplipWithPlugin];
users.users.${userSettings.username}.extraGroups = ["lp" "scanner"]; users.users.${userSettings.username}.extraGroups = ["lp" "scanner"];
}; };

View File

@ -16,24 +16,7 @@
image = ../../../config/backgrounds/${userSettings.background}; image = ../../../config/backgrounds/${userSettings.background};
base16Scheme = base16Scheme =
if userSettings.theme == "catppuccin-mocha" if userSettings.theme == "catppuccin-mocha"
then { then "${pkgs-stable.base16-schemes}/share/themes/${userSettings.theme}.yaml"
base00 = "#1e1e2e";
base01 = "#181825"; # mantle
base02 = "#313244"; # surface0
base03 = "#45475a"; # surface1
base04 = "#585b70"; # surface2
base05 = "#cdd6f4"; # text
base06 = "#f5e0dc"; # rosewater
base07 = "#b4befe"; # lavender
base08 = "#f38ba8"; # red
base09 = "#fab387"; # peach
base0A = "#f9e2af"; # yellow
base0B = "#a6e3a1"; # green
base0C = "#94e2d5"; # teal
base0D = "#89b4fa"; # blue
base0E = "#cba6f7"; # mauve
base0F = "#f2cdcd"; # flamingo
}
else if userSettings.theme == "evangelion-blood" else if userSettings.theme == "evangelion-blood"
then # List all possible themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes then # List all possible themes: $ nix build nixpkgs#base16-schemes && ls result/share/themes
{ {
@ -94,13 +77,13 @@
}; };
serif = { serif = {
package = pkgs.nerd-fonts.ubuntu; package = pkgs.nerd-fonts.monaspace;
name = "Ubuntu NF"; name = "Monaspace Xenon";
}; };
sansSerif = { sansSerif = {
package = pkgs.nerd-fonts.ubuntu; package = pkgs.nerd-fonts.monaspace;
name = "Ubuntu NF"; name = "Monaspace Argon";
}; };
monospace = { monospace = {
@ -117,11 +100,11 @@
targets = { targets = {
plymouth = { plymouth = {
logo = logo =
if userSettings.theme == "evangelion-blood" if (userSettings.theme == "evangelion-blood")
then ../../../config/nerv.png then ../../../config/nerv.png
else if (userSettings.theme == "tokyo-night-dark") else if (userSettings.theme == "tokyo-night-dark")
then ../../../config/copeland.png then ../../../config/copeland.png
else ../../../config/mars.png; else "";
logoAnimated = logoAnimated =
if "evangelion-blood" == userSettings.theme || "tokyo-night-dark" == userSettings.theme if "evangelion-blood" == userSettings.theme || "tokyo-night-dark" == userSettings.theme
then false then false