AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update system

Browse Source
This commit is contained in:
Dmitriy Kholkin 2022-03-10 19:56:27 +03:00
parent 537c46caf6
commit 380c9869a1
6 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
flake.lock generated
View File

@ -68,11 +68,11 @@
}, },
"cachix": { "cachix": {
"locked": { "locked": {
"lastModified": 1642244250, "lastModified": 1645296114,
"narHash": "sha256-vWpUEqQdVP4srj+/YLJRTN9vjpTs4je0cdWKXPbDItc=", "narHash": "sha256-y53N7TyIkXsjMpOG7RhvqJFGDacLs9HlyHeSTBioqYU=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0fd9ee1aa36ce865ad273f4f07fdc093adeb5c00", "rev": "530a53dcbc9437363471167a5e4762c5fcfa34a1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -135,11 +135,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645867939, "lastModified": 1646559628,
"narHash": "sha256-p3vHHMM5W6ojmStJqKpLvdnzxxKGG015U7OK6PJE8lo=", "narHash": "sha256-WDoqxH/IPTV8CkI15wwzvXYgXq9UPr8xd8WKziuaynw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "c7a13f76a78bb5c225ca5e08e9a109347d130792", "rev": "afe96e7433c513bf82375d41473c57d1f66b4e68",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -228,11 +228,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1645801982, "lastModified": 1646854310,
"narHash": "sha256-h7oizwxCAN/Iz/VFk6tI6dAZO1xYSay6oPp+uvf8fM8=", "narHash": "sha256-2ps4Y/dsrBwHCU/w/HWo9nOk/9aK/3D9EESfQb/Mrd0=",
"owner": "nixos", "owner": "nixos",
"repo": "nix", "repo": "nix",
"rev": "df552ff53e68dff8ca360adbdbea214ece1d08ee", "rev": "4d98143914120d0163f5c50f30ce8a5289433f8f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -250,11 +250,11 @@
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1642257542, "lastModified": 1646697248,
"narHash": "sha256-znJjO+22bmYIcMvXTNoxkGrPyCEKhjNpwu/R4gLuKYY=", "narHash": "sha256-1EkvVmPEwvpt0m3Zdc9FecFJ/YQZ6+pCZengETOewsA=",
"owner": "thiagokokada", "owner": "thiagokokada",
"repo": "nix-alien", "repo": "nix-alien",
"rev": "039e009b74b4310986696e28808342741079c7ee", "rev": "d3fe0c2835caeb7a183ad74f700c386cb931419a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -280,11 +280,11 @@
}, },
"nixpkgs-master": { "nixpkgs-master": {
"locked": { "locked": {
"lastModified": 1645895531, "lastModified": 1646927217,
"narHash": "sha256-wQ+rMJtVJou44nOZOr2X9yQncb+CSqcnrYUNztPdYF8=", "narHash": "sha256-MDrf1qb4LSxVU3+fQDZSoVbQf9nIVJmvFR1qdStAULE=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1827d6315a8a6862e9bb40f1bc554045efd95065", "rev": "bcab564e83aeffbe321127b060beb7482a8e44bc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -343,11 +343,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1645652565, "lastModified": 1646588256,
"narHash": "sha256-yVQN2Wi8xSSpuj6JTck/6IOJ40hNvmoReMvFY86xd9w=", "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4275a321beab5a71872fb7a5fe5da511bb2bec73", "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -366,11 +366,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1645824492, "lastModified": 1646921577,
"narHash": "sha256-MYipiyyxqkUnInFvKIW+sOFaRJv4jK7ElJPLRGOEK1c=", "narHash": "sha256-ghkJLoseLYI66z3PqGzsjIXsNBe8KNNCZz8jyKl/nGY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "d16eadfe2b205e4b2004bf25eeae9c358103d07a", "rev": "f3d3ade155710e55b92cd9f82baab621e47173d7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -396,11 +396,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1645433236, "lastModified": 1646497237,
"narHash": "sha256-4va4MvJ076XyPp5h8sm5eMQvCrJ6yZAbBmyw95dGyw4=", "narHash": "sha256-Ccpot1h/rV8MgcngDp5OrdmLTMaUTbStZTR5/sI7zW0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "7f9b6e2babf232412682c09e57ed666d8f84ac2d", "rev": "062a0c5437b68f950b081bbfc8a699d57a4ee026",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -479,11 +479,11 @@
"rycee": { "rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1645875534, "lastModified": 1646897669,
"narHash": "sha256-pWUBJHSefzHx9JHb8CHvGF1HIVHl03VGtejbDU1o8DM=", "narHash": "sha256-aVodp0481EW1WvnEffBEYdkL38Y412Ki/u84MDDlJYo=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "4794b9843a72d8bc25f5643c8847bafb96b3e232", "rev": "85e09b3a2d4c63dc4ff375f97b8585de7391fc00",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

2
modules/secrets.nix
View File

@ -121,7 +121,7 @@ in {
options.secretsConfig = { options.secretsConfig = {
repo = lib.mkOption { repo = lib.mkOption {
type = str; type = str;
default = "git@github.com:AlukardBF/pass.git"; default = "gitea@code.ataraxiadev.com:AtaraxiaDev/pass.git";
}; };
}; };

4
profiles/applications/packages.nix
View File

@ -79,9 +79,9 @@ with config.deviceSpecific; {
] ++ lib.optionals isGaming [ ] ++ lib.optionals isGaming [
# ceserver # ceserver
# ckan # ckan
gamescope # gamescope
goverlay goverlay
multimc # multimc
lutris lutris
obs-studio obs-studio
reshade-shaders reshade-shaders

9
profiles/nix/default.nix
View File

@ -4,13 +4,17 @@ with config.deviceSpecific; {
nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ]; nixPath = lib.mkForce [ "self=/etc/self/compat" "nixpkgs=/etc/nixpkgs" ];
registry.self.flake = inputs.self; registry.self.flake = inputs.self;
# registry.nixpkgs.flake = if !isContainer then inputs.nixpkgs else inputs.nixpkgs-stable;
registry.nixpkgs.flake = inputs.nixpkgs; registry.nixpkgs.flake = inputs.nixpkgs;
optimise.automatic = true; optimise.automatic = true;
# package = if !config.deviceSpecific.isServer then
# inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: {
# patches = [ ./nix.patch ] ++ oa.patches or [ ];
# })
# else pkgs.nixFlakes;
package = if !config.deviceSpecific.isServer then package = if !config.deviceSpecific.isServer then
inputs.nix.defaultPackage.${pkgs.system}.overrideAttrs (oa: { pkgs.nixFlakes.overrideAttrs (oa: {
patches = [ ./nix.patch ] ++ oa.patches or [ ]; patches = [ ./nix.patch ] ++ oa.patches or [ ];
}) })
else pkgs.nixFlakes; else pkgs.nixFlakes;
@ -37,6 +41,5 @@ with config.deviceSpecific; {
}; };
environment.etc.nixpkgs.source = inputs.nixpkgs; environment.etc.nixpkgs.source = inputs.nixpkgs;
# environment.etc.nixpkgs.source = if !isContainer then inputs.nixpkgs else inputs.nixpkgs-stable;
environment.etc.self.source = inputs.self; environment.etc.self.source = inputs.self;
} }

2
profiles/workspace/print-scan.nix
View File

@ -2,7 +2,7 @@
{ {
services.printing = { services.printing = {
enable = true; enable = true;
drivers = [ pkgs.samsungUnifiedLinuxDriver pkgs.gutenprint ]; drivers = [ pkgs.samsung-unified-linux-driver pkgs.gutenprint ];
}; };
hardware.sane.enable = true; hardware.sane.enable = true;

2
profiles/workspace/sway/default.nix
View File

@ -15,7 +15,7 @@ in {
xwayland xwayland
wl-clipboard wl-clipboard
libsForQt5.qt5.qtwayland libsForQt5.qt5.qtwayland
gsettings_desktop_schemas gsettings-desktop-schemas
]); ]);
xdg.portal = { xdg.portal = {