Compare commits

..

No commits in common. "201b62d1a0bbb5ae1bfa59f3f5f50809d1d41f90" and "b9595c7e4dcb9a84c3e222f88fcdaeba55941947" have entirely different histories.

40 changed files with 155 additions and 384 deletions

BIN
car.png

Binary file not shown.

Before

(image error) Size: 3.9 MiB

206
flake.lock generated

@ -53,11 +53,11 @@
"base16-vim": { "base16-vim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1731949548, "lastModified": 1716150083,
"narHash": "sha256-XIDexXM66sSh5j/x70e054BnUsviibUShW7XhbDGhYo=", "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "base16-vim", "repo": "base16-vim",
"rev": "61165b1632409bd55e530f3dbdd4477f011cadc6", "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -74,11 +74,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735644329, "lastModified": 1728330715,
"narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide", "owner": "numtide",
"repo": "devshell", "repo": "devshell",
"rev": "f7795ede5b02664b57035b3b757876703e2c3eac", "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -105,22 +105,6 @@
"type": "github" "type": "github"
} }
}, },
"firefox-gnome-theme": {
"flake": false,
"locked": {
"lastModified": 1734969791,
"narHash": "sha256-A9PxLienMYJ/WUvqFie9qXrNC2MeRRYw7TG/q7DRjZg=",
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"rev": "92f4890bd150fc9d97b61b3583680c0524a8cafe",
"type": "github"
},
"original": {
"owner": "rafaelmardojai",
"repo": "firefox-gnome-theme",
"type": "github"
}
},
"flake-compat": { "flake-compat": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -138,11 +122,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1673956053,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -159,11 +143,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736143030, "lastModified": 1730504689,
"narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +182,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1710146030,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -237,45 +221,18 @@
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
"nixpkgs" "nixpkgs"
]
},
"locked": {
"lastModified": 1735882644,
"narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"git-hooks_2": {
"inputs": {
"flake-compat": [
"stylix",
"flake-compat"
],
"gitignore": "gitignore_2",
"nixpkgs": [
"stylix",
"nixpkgs"
], ],
"nixpkgs-stable": [ "nixpkgs-stable": [
"stylix", "nixvim",
"git-hooks",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1731363552, "lastModified": 1732021966,
"narHash": "sha256-vFta1uHnD29VUY4HJOO/D6p6rxyObnf+InnSMT4jlMU=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -306,41 +263,19 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_2": {
"inputs": {
"nixpkgs": [
"stylix",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732369855, "lastModified": 1713702291,
"narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=", "narHash": "sha256-zYP1ehjtcV8fo+c+JFfkAqktZ384Y+y779fzmR9lQAU=",
"owner": "GNOME", "owner": "GNOME",
"repo": "gnome-shell", "repo": "gnome-shell",
"rev": "dadd58f630eeea41d645ee225a63f719390829dc", "rev": "0d0aadf013f78a7f7f1dc984d0d812971864b934",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "GNOME", "owner": "GNOME",
"ref": "47.2", "ref": "46.1",
"repo": "gnome-shell", "repo": "gnome-shell",
"type": "github" "type": "github"
} }
@ -352,11 +287,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736785676, "lastModified": 1732025103,
"narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -373,11 +308,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736508663, "lastModified": 1732025103,
"narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=", "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", "rev": "a46e702093a5c46e192243edbd977d5749e7f294",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +329,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735774425, "lastModified": 1730837930,
"narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=", "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f6aa268e419d053c3d5025da740e390b12ac936", "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -443,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736370755, "lastModified": 1732016537,
"narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=", "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "57733bd1dc81900e13438e5b4439239f1b29db0e", "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -458,11 +393,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1736881310, "lastModified": 1731890469,
"narHash": "sha256-5BlVeikKoJVrUXBdr1kSrcRQ8o20Kl+ZU2pEzpE5sUw=", "narHash": "sha256-D1FNZ70NmQEwNxpSSdTXCSklBH1z2isPR84J6DQrJGs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "733994ea06585b76621073160e87b0bfac7fc5ae", "rev": "5083ec887760adfe12af64830a66807423a859a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -474,11 +409,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1736798957, "lastModified": 1732014248,
"narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -490,16 +425,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1735648875, "lastModified": 1731531548,
"narHash": "sha256-fQ4k/hyQiH9RRPznztsA9kbcDajvwV1sRm01el6Sr3c=", "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "47e29c20abef74c45322eca25ca1550cdf5c3b50", "rev": "24f0d4acd634792badd6470134c387a3b039dace",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -519,11 +454,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1736961674, "lastModified": 1732143099,
"narHash": "sha256-nuOFHtSUHYsb6PHueFF9KPLS8v+Wi+wGCXZCI+J54QI=", "narHash": "sha256-lh2Qi8gd1SwJVGo7gJjoFvS/djS5Nimaw25j792PJjM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "54e6dbd8c83586d9553f61c21fa639b500e51f93", "rev": "2f71c4250bef7a52fe21bd00d1e58c119f62008c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -542,11 +477,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1735854821, "lastModified": 1731936508,
"narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=", "narHash": "sha256-z0BSSf78LkxIrrFXZYmCoRRAxAmxMUKpK7CyxQRvkZI=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "836908e3bddd837ae0f13e215dd48767aee355f0", "rev": "fe07070f811b717a4626d01fab714a87d422a9e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -570,25 +505,22 @@
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_2",
"git-hooks": "git-hooks_2",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"systems": "systems_2", "systems": "systems_2",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux", "tinted-tmux": "tinted-tmux"
"tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1736955291, "lastModified": 1732261424,
"narHash": "sha256-h5y11C4vMi8VoIVeHr/xFJO5N1nWKiKoAILPPUl7P/8=", "narHash": "sha256-8uTKUHkaU980J5kRnLYrdwmjZYB88eBGUk1oVgIUHFE=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "2985ee9b2836a725b04628d24f934212b96eacbe", "rev": "b667a340730dd3d0596083aa7c949eef01367c62",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -664,11 +596,11 @@
"tinted-tmux": { "tinted-tmux": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729501581, "lastModified": 1696725902,
"narHash": "sha256-1ohEFMC23elnl39kxWnjzH1l2DFWWx4DhFNNYDTYt54=", "narHash": "sha256-wDPg5elZPcQpu7Df0lI5O8Jv4A3T6jUQIVg63KDU+3Q=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-tmux", "repo": "tinted-tmux",
"rev": "f0e7f7974a6441033eb0a172a0342e96722b4f14", "rev": "c02050bebb60dbb20cb433cd4d8ce668ecc11ba7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -677,22 +609,6 @@
"type": "github" "type": "github"
} }
}, },
"tinted-zed": {
"flake": false,
"locked": {
"lastModified": 1725758778,
"narHash": "sha256-8P1b6mJWyYcu36WRlSVbuj575QWIFZALZMTg5ID/sM4=",
"owner": "tinted-theming",
"repo": "base16-zed",
"rev": "122c9e5c0e6f27211361a04fae92df97940eccf9",
"type": "github"
},
"original": {
"owner": "tinted-theming",
"repo": "base16-zed",
"type": "github"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -701,11 +617,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1736154270, "lastModified": 1732111664,
"narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=", "narHash": "sha256-XWHuPWcP59QnHEewdZJXBX1TA2lAP78Vz4daG6tfIr4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b", "rev": "62003fdad7a5ab7b6af3ea9bd7290e4c220277d0",
"type": "github" "type": "github"
}, },
"original": { "original": {

@ -2,11 +2,8 @@
description = "Ficache's system flake"; description = "Ficache's system flake";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
envycontrol.url = "github:bayasdev/envycontrol"; envycontrol.url = "github:bayasdev/envycontrol";
stylix.url = "github:danth/stylix"; stylix.url = "github:danth/stylix";
home-manager = { home-manager = {
@ -18,7 +15,6 @@
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: outputs = { self, nixpkgs, home-manager, ... }@inputs:
@ -28,7 +24,7 @@
in { in {
# ficache-nixos - system hostname # ficache-nixos - system hostname
nixosConfigurations.dixxe-nixos = nixpkgs.lib.nixosSystem { nixosConfigurations.ficache-nixos = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
inherit inputs system; inherit inputs system;
@ -39,7 +35,7 @@
]; ];
}; };
homeConfigurations.dixxe = home-manager.lib.homeManagerConfiguration { homeConfigurations.ficache = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
modules = [ modules = [
./home-manager/home.nix ./home-manager/home.nix

@ -1,15 +1,15 @@
{ {
imports = [ imports = [
./package-groups/video-processing.nix ./package-groups/bundle.nix
./your-modules.nix ./your-modules.nix
./your-packages.nix ./your-packages.nix
]; ];
home = { home = {
username = "dixxe"; username = "ficache";
homeDirectory = "/home/dixxe"; homeDirectory = "/home/ficache";
stateVersion = "24.05"; stateVersion = "24.05";

@ -1,20 +0,0 @@
{pkgs, ...}:
{
home.packages = with pkgs.gnomeExtensions; [
appindicator
dash-to-dock
media-controls
];
dconf = {
enable = true;
settings."org/gnome/shell" = {
disable-user-extensions = false;
enabled-extensions = with pkgs.gnomeExtensions; [
appindicator.extensionUuid
dash-to-dock.extensionUuid
media-controls.extensionUuid
];
};
};
}

@ -0,0 +1,8 @@
{
services.gammastep = {
enable = true;
latitude = 52.58;
longitude = 36.3;
};
}

@ -7,7 +7,6 @@
extraPackages = with pkgs; [ extraPackages = with pkgs; [
marksman marksman
nil nil
gopls
]; ];
# Stylix have troubles with theme for helix right now. # Stylix have troubles with theme for helix right now.
}; };

@ -1,11 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.packages = [ pkgs.dconf ];
stylix = { stylix = {
enable = true; enable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/eighties.yaml"; base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-frappe.yaml";
image = ../../topography.png; image = ../../wallpaper3.png;
cursor = { cursor = {
package = pkgs.oreo-cursors-plus; package = pkgs.oreo-cursors-plus;

@ -2,5 +2,6 @@
{ {
services.syncthing = { services.syncthing = {
enable = true; enable = true;
tray.enable = true;
}; };
} }

@ -1,37 +1,13 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
programs.vscode = programs.vscode = {
{
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
extensions = with pkgs.vscode-extensions; extensions = with pkgs.vscode-extensions; [
[
jnoortheen.nix-ide jnoortheen.nix-ide
ms-dotnettools.vscode-dotnet-runtime
ms-dotnettools.csharp
golang.go golang.go
waderyan.gitblame
donjayamanne.githistory
samuelcolvin.jinjahtml
ziglang.vscode-zig
]; ];
userSettings =
{
"terminal.integrated.defaultProfile.linux" = "null";
"terminal.integrated.shell.linux" = "/run/current-system/sw/bin/bash";
"files.autoSave" = "on";
"editor.minimap.enabled" = false;
"clangd.fallbackFlags" = [
"-Wall"
"-Wextra"
"-Wpedantic"
"-Werror"
"-I./includes"
];
"editor.rulers" = [
{
"column" = 80;
"color" = "#ff9900";
}
];
};
}; };
} }

@ -0,0 +1,5 @@
{
imports = [
./video-processing.nix
];
}

@ -1,4 +1,4 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
programs.obs-studio = { programs.obs-studio = {
@ -10,10 +10,10 @@
]; ];
}; };
home.packages = with pkgs; [ home.packages = [
pkgs.jellyfin-ffmpeg
pkgs.libsForQt5.kdenlive
jellyfin-ffmpeg
gpu-screen-recorder-gtk
audacity
]; ];
} }

@ -4,8 +4,7 @@
./modules/git.nix ./modules/git.nix
./modules/stylix.nix ./modules/stylix.nix
./modules/syncthing.nix ./modules/syncthing.nix
./modules/helix.nix #./modules/helix.nix
./modules/vscodium.nix ./modules/vscodium.nix
./modules/desktop-managers/gnomeModule.nix
]; ];
} }

@ -2,28 +2,28 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
logseq obsidian
joplin-desktop alacritty
vlc vlc
gnome-tweaks
# Social stuff # Social stuff
telegram-desktop telegram-desktop
vesktop
element-desktop
librewolf firefox
qbittorrent qbittorrent
libreoffice libreoffice
gimp
# Minecraft stuff # Minecraft stuff
prismlauncher prismlauncher
#Development stuff
krita
dotnetCorePackages.sdk_9_0
godot_4-mono
]; ];
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
"electron-27.3.11" "obsidian"
]; ];
} }

@ -9,29 +9,23 @@
]; ];
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod" ];
boot.initrd.kernelModules = [ "dm-snapshot" "cryptd" ]; boot.initrd.kernelModules = [ ];
boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS";
boot.kernelModules = [ "kvm-amd" ]; boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-label/NIXOS_ROOT"; { device = "/dev/disk/by-uuid/9d35945a-2c1e-463d-b47a-545093d19de1";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-label/NIXOS_BOOT"; { device = "/dev/disk/by-uuid/0894-A975";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [ "fmask=0077" "dmask=0077" ];
}; };
fileSystems."/home" =
{ device = "/dev/disk/by-label/NIXOS_HOME";
fsType = "ext4";
};
swapDevices = swapDevices =
[ { device = "/dev/disk/by-label/NIXOS_SWAP"; } [ { device = "/dev/disk/by-uuid/2a100390-c20d-4d74-804c-db52551b9d76"; }
]; ];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
@ -42,6 +36,5 @@
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.enableAllFirmware = true;
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

@ -1,10 +1,9 @@
{ pkgs, lib, ... }: { ... }:
{ {
services = { services = {
libinput.enable = true; libinput.enable = true;
displayManager.defaultSession = "gnome"; displayManager.defaultSession = "gnome";
power-profiles-daemon.enable = false;
}; };
services.xserver = { services.xserver = {
@ -14,44 +13,4 @@
gnome.enable = true; gnome.enable = true;
}; };
}; };
# Extensions are managed in gnomeModule.nix
#
environment.systemPackages = with pkgs; [ gnomeExtensions.appindicator ];
services.gnome.gnome-settings-daemon.enable = true;
environment.gnome.excludePackages = (with pkgs; [
atomix # puzzle game
cheese # webcam tool
epiphany # web browser
evince # document viewer
geary # email reader
gedit # text editor
gnome-characters
gnome-music
gnome-photos
gnome-terminal
gnome-tour
hitori # sudoku game
iagno # go game
tali # poker game
totem # video player
]);
nixpkgs.overlays = [
# GNOME 46: triple-buffering-v4-46
(final: prev: {
gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
mutter = gnomePrev.mutter.overrideAttrs (old: {
src = pkgs.fetchFromGitLab {
domain = "gitlab.gnome.org";
owner = "vanvugt";
repo = "mutter";
rev = "triple-buffering-v4-46";
hash = "sha256-fkPjB/5DPBX06t7yj0Rb3UEuu5b9mu3aS+jhH18+lpI=";
};
});
});
})
];
} }

@ -14,6 +14,10 @@
services = { services = {
libinput.enable = true; libinput.enable = true;
displayManager = {
sddm.enable = true;
};
desktopManager = { desktopManager = {
plasma6.enable = true; plasma6.enable = true;
}; };
@ -23,16 +27,5 @@
services.xserver = { services.xserver = {
enable = true; enable = true;
displayManager = {
gdm.enable = true;
gdm.wayland = true;
}; };
};
#qt = {
# enable = true;
# platformTheme = "gnome";
# style = "adwaita-dark";
#};
} }

@ -3,6 +3,7 @@
{ {
programs.steam = { programs.steam = {
enable = true; enable = true;
#extest.enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true; dedicatedServer.openFirewall = true;
localNetworkGameTransfers.openFirewall = true; localNetworkGameTransfers.openFirewall = true;
@ -20,6 +21,10 @@
environment.systemPackages = [ environment.systemPackages = [
pkgs.lutris
pkgs.wineWowPackages.waylandFull
pkgs.winetricks
pkgs.dxvk pkgs.dxvk
pkgs.mesa pkgs.mesa
pkgs.mangohud pkgs.mangohud

@ -16,11 +16,9 @@
hardware.nvidia.prime = { hardware.nvidia.prime = {
#sync.enable = true; sync.enable = true;
#offload.enable = true;
reverseSync.enable = true;
nvidiaBusId = "PCI:1:0:0"; nvidiaBusId = "PCI:1:0:0";
amdgpuBusId = "PCI:4:0:0"; amdgpuBusId = "PCI:4:2:0";
}; };
} }

@ -1,9 +1,5 @@
{ pkgs, ...}:
{ {
# Bootloader. # Bootloader.
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.kernel.sysctl."kernel.sysrq" = 502; # Enable sysrq keys because FUCK YOU NVIDIA!!!
boot.plymouth.enable = true;
} }

@ -7,6 +7,5 @@
./xkb-settings.nix ./xkb-settings.nix
./users.nix ./users.nix
./garbage-collector.nix ./garbage-collector.nix
./kernel.nix
]; ];
} }

@ -2,7 +2,7 @@
{ {
fonts.packages = with pkgs; [ fonts.packages = with pkgs; [
nerd-fonts.ubuntu (nerdfonts.override { fonts = [ "Ubuntu" ]; })
noto-fonts noto-fonts
hack-font hack-font
]; ];

@ -1,5 +0,0 @@
{pkgs, ...}:
{
#linux kernel
boot.kernelPackages = pkgs.linuxPackages_zen;
}

@ -1,5 +1,5 @@
{ {
networking.hostName = "dixxe-nixos"; # Define your hostname. networking.hostName = "ficache-nixos"; # Define your hostname.
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.\ # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.\
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
} }

@ -1,8 +1,8 @@
{ {
# Define a user account. Don't forget to set a password with passwd. # Define a user account. Don't forget to set a password with passwd.
users.users.dixxe = { users.users.ficache = {
isNormalUser = true; isNormalUser = true;
description = "dixxe"; description = "ficache";
extraGroups = [ "networkmanager" "wheel" "tpws" ]; extraGroups = [ "networkmanager" "wheel" "tpws" ];
}; };
} }

@ -1,6 +0,0 @@
{...}:
{
programs.nix-ld = {
enable = true;
};
}

@ -1,5 +1,5 @@
{ {
services.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

@ -1,23 +0,0 @@
{ pkgs, ... }:
{
services.postgresql = {
enable = true;
ensureDatabases = [ "mydatabase" ];
enableTCPIP = true;
# port = 5432;
authentication = pkgs.lib.mkOverride 10 ''
#...
#type database DBuser origin-address auth-method
local all all trust
# ipv4
host all all 127.0.0.1/32 trust
# ipv6
host all all ::1/128 trust
'';
initialScript = pkgs.writeText "backend-initScript" ''
CREATE ROLE nixcloud WITH LOGIN PASSWORD 'nixcloud' CREATEDB;
CREATE DATABASE nixcloud;
GRANT ALL PRIVILEGES ON DATABASE nixcloud TO nixcloud;
'';
};
}

@ -1,9 +0,0 @@
{
programs.virt-manager.enable = true;
users.groups.libvirtd.members = ["dixxe"];
virtualisation.libvirtd.enable = true;
virtualisation.spiceUSBRedirection.enable = true;
}

@ -3,8 +3,6 @@
services = { services = {
zapret = { zapret = {
enable = true; enable = true;
udpPorts = [ "50000:65535" "27000:27100" ];
udpSupport = true;
params = [ params = [
"--dpi-desync-autottl=3" "--dpi-desync-autottl=3"
"--wssize 1:6" "--wssize 1:6"
@ -13,10 +11,6 @@
"--dpi-desync=syndata,fake,split2" "--dpi-desync=syndata,fake,split2"
"--dpi-desync-repeats=6" "--dpi-desync-repeats=6"
"--dpi-desync-fooling=md5sig" "--dpi-desync-fooling=md5sig"
"--dpi-desync=fake,split2"
"--dpi-desync-any-protocol"
"--new" "--new"
]; ];
whitelist = [ whitelist = [
@ -59,7 +53,7 @@
"7tv.app" "7tv.app"
"7tv.io" "7tv.io"
"10tv.app" "10tv.app"
"dixxe.top" "x.com"
]; ];
}; };
}; };

@ -2,10 +2,7 @@
{ {
services.zerotierone = { services.zerotierone = {
enable = true; enable = true;
joinNetworks = [ joinNetworks = [ "41d49af6c287fe2b" ];
"41d49af6c287fe2b"
"272f5eae16114dee"
];
}; };
} }

@ -6,6 +6,7 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
inputs.envycontrol.packages.x86_64-linux.default inputs.envycontrol.packages.x86_64-linux.default
pciutils
home-manager home-manager
nh nh
]; ];

@ -3,14 +3,11 @@
./modules/gaming-tweaks.nix ./modules/gaming-tweaks.nix
./modules/pipewire.nix ./modules/pipewire.nix
./modules/auto-cpufreq.nix ./modules/auto-cpufreq.nix
#./modules/zapret.nix ./modules/zapret.nix
#./modules/virtualbox.nix
#./modules/postgresql.nix
#./modules/nix-ld.nix
./modules/zerotierone.nix ./modules/zerotierone.nix
./modules/hardware/nvidia.nix ./modules/hardware/nvidia.nix
./modules/hardware/battery-threshold.nix ./modules/hardware/battery-threshold.nix
./modules/desktop-enviroments/gnome.nix ./modules/desktop-enviroments/plasma6.nix
]; ];
} }

BIN
preview.png Normal file

Binary file not shown.

After

(image error) Size: 1.1 MiB

Binary file not shown.

Before

(image error) Size: 1.0 MiB

Binary file not shown.

Before

(image error) Size: 2.9 MiB

Binary file not shown.

Before

(image error) Size: 110 KiB

BIN
wallpaper.png Normal file

Binary file not shown.

After

(image error) Size: 1.5 MiB

BIN
wallpaper2.png Normal file

Binary file not shown.

After

(image error) Size: 5.7 MiB

BIN
wallpaper3.png Normal file

Binary file not shown.

After

(image error) Size: 7.5 MiB