Compare commits

..

No commits in common. "82cb452980b306b51c292ad871af00959c6c59fd" and "fa1c6c47256deac4e717fa30f5ac7ae53383593e" have entirely different histories.

4 changed files with 10 additions and 46 deletions

View File

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745380081, "lastModified": 1745362344,
"narHash": "sha256-bUy25YkdRfdWPxSyx22igWi6g3rd3HXKFg+yL4dfBPY=", "narHash": "sha256-R4d7j2urn/W+K9crKJaxJvZOsVX5v7uCAymaDBq97SE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1d0e13904bd8c444ab1595f686ede5eff377e881", "rev": "b99e3e46b86aefc01f229e0a29d0c03c1079aaed",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -20,26 +20,6 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1745120797,
"narHash": "sha256-owQ0VQ+7cSanTVPxaZMWEzI22Q4bGnuvhVjLAJBNQ3E=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "69716041f881a2af935021c1182ed5b0cc04d40e",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1745234285, "lastModified": 1745234285,
@ -59,7 +39,6 @@
"root": { "root": {
"inputs": { "inputs": {
"home-manager": "home-manager", "home-manager": "home-manager",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
} }
} }

View File

@ -3,30 +3,20 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nix-index-database.url = "github:nix-community/nix-index-database";
nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
}; };
outputs = { self, nixpkgs, home-manager, nix-index-database, ... }@inputs: { outputs = { self, nixpkgs, home-manager, ... }@inputs: {
nixosConfigurations.rainix = nixpkgs.lib.nixosSystem { nixosConfigurations.rainix = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [ ./configuration.nix home-manager.nixosModules.home-manager {
./configuration.nix home-manager.useGlobalPkgs = true;
nix-index-database.nixosModules.nix-index home-manager.useUserPackages = true;
{ home-manager.users.rainy = import ./home.nix;
programs.nix-index-database.comma.enable = true; } ];
}
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.rainy = import ./home.nix;
}
];
}; };
}; };
} }

View File

@ -9,8 +9,6 @@
home.username = "rainy"; home.username = "rainy";
home.homeDirectory = "/home/rainy"; home.homeDirectory = "/home/rainy";
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.nix-index.enable = true;
home.packages = [ home.packages = [
pkgs.krita pkgs.krita
@ -26,8 +24,6 @@
pkgs.gamescope pkgs.gamescope
pkgs.fastfetch pkgs.fastfetch
pkgs.upscayl pkgs.upscayl
pkgs.heroic
#pkgs.comma
]; ];
home.stateVersion = "25.05"; home.stateVersion = "25.05";

View File

@ -4,10 +4,9 @@
programs.fish = { programs.fish = {
enable = true; enable = true;
shellAliases = { shellAliases = {
nxr = "cd ~/nix-config && sudo nix flake update && sudo nixos-rebuild switch --upgrade --flake .#"; nxr = "cd ~/nix-config && nix flake update && sudo nixos-rebuild switch --upgrade --flake .#";
nxe = "nano /home/rainy/nix-config/configuration.nix"; nxe = "nano /home/rainy/nix-config/configuration.nix";
nxh = "nano /home/rainy/nix-config/home.nix"; nxh = "nano /home/rainy/nix-config/home.nix";
nxt = "cd ~/nix-config && sudo nixos-rebuild test --flake .#";
}; };
interactiveShellInit = '' interactiveShellInit = ''
set fish_greeting set fish_greeting