cnst/cnix
1
0
Fork 0
Code Issues Pull Requests Activity

restructuring

Browse Source
This commit is contained in:
cnst
2024-06-23 16:37:06 +02:00
parent cdf2b9771c
commit f9e2ad7321
6 changed files with 212 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

175
flake.lock generated
View File

@@ -1,17 +1,56 @@
{ {
"nodes": { "nodes": {
"flake-compat": { "cachix": {
"flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1635350005,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-tAMJnUwfaDEB2aa31jGcu7R7bzGELM9noc91L2PbVjg=",
"owner": "edolstra", "owner": "nixos",
"repo": "flake-compat", "repo": "nixpkgs",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "1c1f5649bb9c1b0d98637c8c365228f57126f361",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "edolstra", "owner": "nixos",
"ref": "nixos-20.09",
"repo": "nixpkgs",
"type": "github"
}
},
"firefox-nightly": {
"inputs": {
"cachix": "cachix",
"flake-compat": "flake-compat",
"lib-aggregate": "lib-aggregate",
"mozilla": "mozilla",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1719145560,
"narHash": "sha256-LLg4I+NSx94iHsJMy1AK+UlOa0QRmzMxBmrKj2iVhtc=",
"owner": "nix-community",
"repo": "flake-firefox-nightly",
"rev": "b42f1c6122099e4be0e5f78d7b127954a7e95e3f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-firefox-nightly",
"type": "github"
}
},
"flake-compat": {
"locked": {
"lastModified": 1717312683,
"narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
"owner": "nix-community",
"repo": "flake-compat",
"rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "flake-compat", "repo": "flake-compat",
"type": "github" "type": "github"
} }
@@ -48,6 +87,22 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -90,9 +145,27 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_3",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
@@ -181,9 +254,44 @@
"type": "github" "type": "github"
} }
}, },
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1719144654,
"narHash": "sha256-3eKm5xwc2M4WJ1wQ4POID8jpDARWXEAMcuh1xDItJl8=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "7f1a89b58b9d3ba655a381f8ab1806a8ccdfb03a",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "lib-aggregate",
"type": "github"
}
},
"mozilla": {
"flake": false,
"locked": {
"lastModified": 1704373101,
"narHash": "sha256-+gi59LRWRQmwROrmE1E2b3mtocwueCQqZ60CwLG+gbg=",
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"rev": "9b11a87c0cc54e308fa83aac5b4ee1816d5418a2",
"type": "github"
},
"original": {
"owner": "mozilla",
"repo": "nixpkgs-mozilla",
"type": "github"
}
},
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_2",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
@@ -193,11 +301,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1718935491, "lastModified": 1719151941,
"narHash": "sha256-Dk+ZTVu3CuVv4UPbif3GmR7eT3zAE/mQ+3UUvFHknKE=", "narHash": "sha256-6DlzbOUC14DN3ChG6YDfHp3dlyRunlCuNIGiJ0/j0SU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "cc2d148e283e05cce751c5cc50ce38bbc0589f61", "rev": "8fbf3ad99db5af164230b7965de5572ce238c0da",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -209,11 +317,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1718890629, "lastModified": 1719082813,
"narHash": "sha256-TLJ8xTHKgnbsMnlmfQ7eF5+aafjo5PlFQFF3mkrIsBs=", "narHash": "sha256-C2stSASvUp0XHljA6iZfDFHSH0JIDJ0g7g0uQUIHU2E=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "0e3e1e6b6d8370f1fcc9887d5cb931b131450a1c", "rev": "6c3f7e7e27a0ffcf6d58dc1f5ad2fce7e59a2d88",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -238,6 +346,21 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": {
"locked": {
"lastModified": 1719103869,
"narHash": "sha256-kbTUy+/lfjUrMfV7JkTJwxowsFhi9Tb3BdbiOcIGcsc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "f820613f886cd1aa4bcfd1dbaa6c83c8a3dcd863",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1718835956, "lastModified": 1718835956,
@@ -256,17 +379,18 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"firefox-nightly": "firefox-nightly",
"home-manager": "home-manager", "home-manager": "home-manager",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"solaar": "solaar", "solaar": "solaar",
"systems": "systems" "systems": "systems_2"
} }
}, },
"solaar": { "solaar": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@@ -285,6 +409,21 @@
} }
}, },
"systems": { "systems": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_2": {
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

5
flake.nix
View File

@@ -15,6 +15,11 @@
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Firefox Nightly
firefox-nightly = {
url = "github:nix-community/flake-firefox-nightly";
inputs.nixpkgs.follows = "nixpkgs";
};
# Home manager # Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";

12
home-manager/firefox/default.nix Normal file
View File

@@ -0,0 +1,12 @@
{
programs.firefox = {
enable = true;
};
xdg.mimeApps.defaultApplications = {
"text/html" = [ "firefox.desktop" ];
"text/xml" = [ "firefox.desktop" ];
"x-scheme-handler/http" = [ "firefox.desktop" ];
"x-scheme-handler/https" = [ "firefox.desktop" ];
};
}

5
home-manager/home.nix
View File

@@ -14,6 +14,7 @@
./git ./git
./gtk ./gtk
./shell ./shell
./firefox
]; ];
nixpkgs = { nixpkgs = {
@@ -48,13 +49,12 @@
# programs.neovim.enable = true; # programs.neovim.enable = true;
home.packages = with pkgs; [ home.packages = with pkgs; [
# Desktop # Desktop
firefox
alacritty alacritty
wl-clipboard wl-clipboard
dunst dunst
keepassxc keepassxc
ranger ranger
webcord-vencord webcord
xfce.thunar xfce.thunar
xfce.thunar-volman xfce.thunar-volman
xfce.thunar-archive-plugin xfce.thunar-archive-plugin
@@ -64,7 +64,6 @@
wireguard-tools wireguard-tools
wpa_supplicant wpa_supplicant
ntfs3g ntfs3g
xdg-utils
kdePackages.polkit-kde-agent-1 kdePackages.polkit-kde-agent-1
networkmanagerapplet networkmanagerapplet
blueman blueman

2
nixos/configuration.nix
View File

@@ -19,7 +19,6 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./users.nix # ./users.nix
# Import your generated (nixos-generate-config) hardware configuration # Import your generated (nixos-generate-config) hardware configuration
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@@ -121,6 +120,7 @@
pkgs.unzip pkgs.unzip
pkgs.p7zip pkgs.p7zip
pkgs.unrar pkgs.unrar
pkgs.xdg-utils
]; ];
localBinInPath = true; localBinInPath = true;
}; };

35
nixos/xdg/default.nix Normal file
View File

@@ -0,0 +1,35 @@
{
pkgs,
config,
lib,
...
}:
{
config = {
# see profiles/desktop-<foo>.nix for xdg-portal stuff
home-manager.users.cnst =
{ pkgs, ... }:
{
home.packages =
with pkgs;
[ xdg-user-dirs ]
++ (lib.optionals (pkgs.stdenv.hostPlatform.system != "riscv64-linux") [ xdg-utils ]);
xdg = {
enable = true;
userDirs = {
enable = true;
desktop = "$HOME/desktop";
documents = "$HOME/documents";
download = "$HOME/downloads";
music = "$HOME/documents/music";
pictures = "$HOME/documents/images";
publicShare = "$HOME/documents/share";
templates = "$HOME/documents/templates";
videos = "$HOME/documents/videos";
};
};
};
};
}