Compare commits

..

No commits in common. "00960faecbe0712d2b9ac911cb74f9a32e91ad45" and "e75add05f4a0df069177171df2401c90453df106" have entirely different histories.

7 changed files with 7 additions and 52 deletions

View file

@ -1,26 +1,5 @@
{ {
"nodes": { "nodes": {
"flake-programs-sqlite": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"utils": "utils"
},
"locked": {
"lastModified": 1729631745,
"narHash": "sha256-Q+H6s8c9e0zkTgetge1zjeVDS0wgRDB3hD+/u417xrg=",
"owner": "wamserma",
"repo": "flake-programs-sqlite",
"rev": "7bf5486776f4993d8159fa96af2f7de1181c770a",
"type": "github"
},
"original": {
"owner": "wamserma",
"repo": "flake-programs-sqlite",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -75,26 +54,10 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-programs-sqlite": "flake-programs-sqlite",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
} }
},
"utils": {
"locked": {
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -8,13 +8,9 @@
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-programs-sqlite = {
url = "github:wamserma/flake-programs-sqlite";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = { nixpkgs, nixpkgs-stable, home-manager, flake-programs-sqlite, ... }@inputs: outputs = { nixpkgs, nixpkgs-stable, home-manager, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
@ -24,7 +20,6 @@
inherit system; inherit system;
specialArgs = { specialArgs = {
inherit pkgs-stable; inherit pkgs-stable;
inherit flake-programs-sqlite;
}; };
modules = [ ./system ]; modules = [ ./system ];
}; };

View file

@ -1,4 +1,4 @@
{ config, pkgs, lib, flake-programs-sqlite, ... }: { config, pkgs, lib, ... }:
{ {
nix.settings = { nix.settings = {
@ -35,8 +35,6 @@
settings.default = [ "Alacritty.desktop" ]; settings.default = [ "Alacritty.desktop" ];
}; };
programs.command-not-found.dbPath = flake-programs-sqlite.packages.${pkgs.system}.programs-sqlite;
system.stateVersion = "24.05"; system.stateVersion = "24.05";
} }

View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { config, pkgs, homeDirectory, ... }:
let let
deps = { deps = {
@ -6,7 +6,7 @@ let
nsxiv-rifle = [ pkgs.nsxiv ]; nsxiv-rifle = [ pkgs.nsxiv ];
screenshot = [ pkgs.maim pkgs.xclip ]; screenshot = [ pkgs.maim pkgs.xclip ];
}; };
mkln = x: config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.local/nixos/user/bin/${x}"; mkln = x: config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.local/nixos/user/bin/${x}";
in { in {
home.file = builtins.listToAttrs (map home.file = builtins.listToAttrs (map
(x: { (x: {

View file

@ -5,7 +5,7 @@ standard_dialogs=kde
style=Breeze style=Breeze
[Fonts] [Fonts]
fixed="Noto Sans Mono,10,-1,5,50,0,0,0,0,0" fixed="Noto Sans,10,-1,5,50,0,0,0,0,0"
general="Noto Sans,10,-1,5,50,0,0,0,0,0" general="Noto Sans,10,-1,5,50,0,0,0,0,0"
[Interface] [Interface]

View file

@ -49,7 +49,6 @@
starship starship
killall killall
file file
nix-tree
(python312.withPackages (python-pkgs: [ (python312.withPackages (python-pkgs: [
python-pkgs.pwntools python-pkgs.pwntools

View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, homeDirectory, ... }:
let let
mkln = x: config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/.local/nixos/user/${x}"; mkln = x: config.lib.file.mkOutOfStoreSymlink "${homeDirectory}/.local/nixos/user/${x}";
in { in {
xdg.configFile.alacritty.source = mkln "config/alacritty"; xdg.configFile.alacritty.source = mkln "config/alacritty";
xdg.configFile.awesome.source = mkln "config/awesome"; xdg.configFile.awesome.source = mkln "config/awesome";