Compare commits
4 Commits
658a645080
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
82f1a5b92d
|
|||
|
cb686c36ec
|
|||
|
9864dbd348
|
|||
|
76389b1902
|
39
flake.lock
generated
39
flake.lock
generated
@@ -28,15 +28,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763869804,
|
"lastModified": 1764866045,
|
||||||
"narHash": "sha256-2lw+MnkrnygEyUl+3qZjnlCCJF/kJ57GUtYkAQPfLDA=",
|
"narHash": "sha256-0GsEtXV9OquDQ1VclQfP16cU5VZh7NEVIOjSH4UaJuM=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "04c27d743d069cad58f9707ee8e165c471b1c7cd",
|
"rev": "f63d0fe9d81d36e5fc95497217a72e02b8b7bcab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
|
"ref": "release-25.11",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -92,11 +93,11 @@
|
|||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1762847253,
|
"lastModified": 1764440730,
|
||||||
"narHash": "sha256-BWWnUUT01lPwCWUvS0p6Px5UOBFeXJ8jR+ZdLX8IbrU=",
|
"narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "899dc449bc6428b9ee6b3b8f771ca2b0ef945ab9",
|
"rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -108,27 +109,27 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763678758,
|
"lastModified": 1764677808,
|
||||||
"narHash": "sha256-+hBiJ+kG5IoffUOdlANKFflTT5nO3FrrR2CA3178Y5s=",
|
"narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "117cc7f94e8072499b0a7aa4c52084fa4e11cc9b",
|
"rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-unstable",
|
"ref": "nixos-25.11",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-master": {
|
"nixpkgs-master": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763880652,
|
"lastModified": 1764884164,
|
||||||
"narHash": "sha256-0IQWEH6dED59HH725MKtCLQ9vm0G8NsrMl3ZpbL6qr0=",
|
"narHash": "sha256-JVBdqcz6O7noXRImADjFh+J7+14wigl+Vkt1hHTr56M=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6bad1c7d404896921ecc336cd73a0ebec26f6b56",
|
"rev": "953a2e2892dc8e6b9623e233853239984c11dd7c",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -138,18 +139,18 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1763622513,
|
"lastModified": 1764667669,
|
||||||
"narHash": "sha256-1jQnuyu82FpiSxowrF/iFK6Toh9BYprfDqfs4BB+19M=",
|
"narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c58bc7f5459328e4afac201c5c4feb7c818d604b",
|
"rev": "418468ac9527e799809c900eda37cbff999199b6",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-unstable",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -212,7 +213,7 @@
|
|||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs-master": "nixpkgs-master",
|
"nixpkgs-master": "nixpkgs-master",
|
||||||
"nixpkgs-stable": "nixpkgs-stable",
|
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||||
"photocatalog": "photocatalog",
|
"photocatalog": "photocatalog",
|
||||||
"raspberry-pi-nix": "raspberry-pi-nix"
|
"raspberry-pi-nix": "raspberry-pi-nix"
|
||||||
}
|
}
|
||||||
|
|||||||
17
flake.nix
17
flake.nix
@@ -2,11 +2,11 @@
|
|||||||
description = "Fxnet system configurations";
|
description = "Fxnet system configurations";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager/release-25.11";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
photocatalog = {
|
photocatalog = {
|
||||||
@@ -26,7 +26,6 @@
|
|||||||
};
|
};
|
||||||
nix-flatpak = {
|
nix-flatpak = {
|
||||||
url = "github:gmodena/nix-flatpak";
|
url = "github:gmodena/nix-flatpak";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -34,7 +33,7 @@
|
|||||||
{
|
{
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-stable,
|
nixpkgs-unstable,
|
||||||
nixpkgs-master,
|
nixpkgs-master,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
@@ -57,9 +56,9 @@
|
|||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
pkgsStableSettings =
|
pkgsUnstableSettings =
|
||||||
system:
|
system:
|
||||||
import nixpkgs-stable {
|
import nixpkgs-unstable {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
};
|
};
|
||||||
@@ -94,7 +93,7 @@
|
|||||||
];
|
];
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
pkgsStable = pkgsStableSettings pkgs.system;
|
pkgsUnstable = pkgsUnstableSettings pkgs.system;
|
||||||
pkgsMaster = pkgsMasterSettings pkgs.system;
|
pkgsMaster = pkgsMasterSettings pkgs.system;
|
||||||
hosts = hosts;
|
hosts = hosts;
|
||||||
};
|
};
|
||||||
@@ -121,7 +120,7 @@
|
|||||||
system = host.system;
|
system = host.system;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs;
|
inherit inputs;
|
||||||
pkgsStable = pkgsStableSettings host.system;
|
pkgsUnstable = pkgsUnstableSettings host.system;
|
||||||
pkgsMaster = pkgsMasterSettings host.system;
|
pkgsMaster = pkgsMasterSettings host.system;
|
||||||
hosts = hosts;
|
hosts = hosts;
|
||||||
quirks = (quirks: (import ./quirks { inherit quirks; }));
|
quirks = (quirks: (import ./quirks { inherit quirks; }));
|
||||||
|
|||||||
@@ -108,6 +108,10 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
|
niri = {
|
||||||
|
enable = false;
|
||||||
|
};
|
||||||
|
|
||||||
gamemode = {
|
gamemode = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ in
|
|||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
kdePackages.plasma-sdk
|
kdePackages.plasma-sdk
|
||||||
yandex-music
|
yandex-music
|
||||||
|
krusader
|
||||||
|
|
||||||
avidemux
|
avidemux
|
||||||
gimp
|
gimp
|
||||||
@@ -36,6 +37,7 @@ in
|
|||||||
sauerbraten
|
sauerbraten
|
||||||
|
|
||||||
#Development
|
#Development
|
||||||
|
yandex-cloud
|
||||||
devenv
|
devenv
|
||||||
direnv
|
direnv
|
||||||
yaml-language-server
|
yaml-language-server
|
||||||
@@ -58,7 +60,7 @@ in
|
|||||||
ssh.enable = true;
|
ssh.enable = true;
|
||||||
|
|
||||||
vivaldi = {
|
vivaldi = {
|
||||||
flatpak = true;
|
enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
firefox = {
|
firefox = {
|
||||||
|
|||||||
28
modules/hm/niri.nix
Normal file
28
modules/hm/niri.nix
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
{
|
||||||
|
pkgs,
|
||||||
|
osConfig,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
enable = osConfig.programs.niri.enable;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
|
programs = lib.mkIf (enable) {
|
||||||
|
alacritty.enable = true; # Super+T in the default setting (terminal)
|
||||||
|
fuzzel.enable = true; # Super+D in the default setting (app launcher)
|
||||||
|
swaylock.enable = true; # Super+Alt+L in the default setting (screen locker)
|
||||||
|
waybar.enable = true; # launch on startup in the default setting (bar)
|
||||||
|
};
|
||||||
|
services = lib.mkIf (enable) {
|
||||||
|
mako.enable = true; # notification daemon
|
||||||
|
swayidle.enable = true; # idle management daemon
|
||||||
|
};
|
||||||
|
|
||||||
|
home.packages =
|
||||||
|
with pkgs;
|
||||||
|
lib.mkIf (enable) [
|
||||||
|
swaybg
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -25,7 +25,7 @@ in
|
|||||||
executable = true;
|
executable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.vivaldi = {
|
programs.vivaldi = lib.mkIf (conf.enable) {
|
||||||
nativeMessagingHosts =
|
nativeMessagingHosts =
|
||||||
[ ]
|
[ ]
|
||||||
++ lib.optionals (osConfig.services.desktopManager.plasma6.enable) [
|
++ lib.optionals (osConfig.services.desktopManager.plasma6.enable) [
|
||||||
|
|||||||
Reference in New Issue
Block a user