Compare commits

..

No commits in common. "67d3b8ca50e0113bcf58d25dfa8befe227c73aec" and "185fd5a53bd6def7f7e1e5258b458a3bc6daa48a" have entirely different histories.

12 changed files with 96 additions and 37 deletions

100
flake.lock generated
View file

@ -22,9 +22,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"treefmt-nix": [ "treefmt-nix": "treefmt-nix"
"treefmt"
]
}, },
"locked": { "locked": {
"lastModified": 1772353697, "lastModified": 1772353697,
@ -138,6 +136,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"statix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1754487366,
"narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1614513358, "lastModified": 1614513358,
@ -174,12 +193,31 @@
"type": "github" "type": "github"
} }
}, },
"home-manager_2": {
"inputs": {
"nixpkgs": [
"impermanence",
"nixpkgs"
]
},
"locked": {
"lastModified": 1768598210,
"narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "home-manager",
"type": "github"
}
},
"impermanence": { "impermanence": {
"inputs": { "inputs": {
"home-manager": [ "home-manager": "home-manager_2",
"home-manager" "nixpkgs": "nixpkgs_2"
],
"nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1769548169, "lastModified": 1769548169,
@ -213,16 +251,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1768564909, "lastModified": 1770107345,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "narHash": "sha256-tbS0Ebx2PiA1FRW8mt8oejR0qMXmziJmPaU1d4kYY9g=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "rev": "4533d9293756b63904b7238acb84ac8fe4c8c2c4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-unstable", "ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -259,6 +297,22 @@
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1768564909,
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1772047000, "lastModified": 1772047000,
"narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=", "narHash": "sha256-7DaQVv4R97cii/Qdfy4tmDZMB2xxtyIvNGSwXBBhSmo=",
@ -301,7 +355,7 @@
"home-manager": "home-manager", "home-manager": "home-manager",
"impermanence": "impermanence", "impermanence": "impermanence",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_3",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"radicale-birthday-calendar": "radicale-birthday-calendar", "radicale-birthday-calendar": "radicale-birthday-calendar",
"sops": "sops", "sops": "sops",
@ -332,9 +386,7 @@
}, },
"statix": { "statix": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": "flake-parts_2",
"flake-parts"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -390,6 +442,24 @@
"type": "github" "type": "github"
} }
}, },
"treefmt-nix": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1770228511,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"vscode-extensions": { "vscode-extensions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [

View file

@ -23,10 +23,7 @@
statix = { statix = {
url = "github:oppiliappan/statix"; url = "github:oppiliappan/statix";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
}; };
# For Workstations # For Workstations
@ -53,17 +50,11 @@
}; };
# For Servers # For Servers
impermanence = { impermanence.url = "github:nix-community/impermanence";
url = "github:nix-community/impermanence";
inputs.home-manager.follows = "home-manager";
};
comin = { comin = {
url = "github:nlewo/comin"; url = "github:nlewo/comin";
inputs = { inputs.nixpkgs.follows = "nixpkgs";
nixpkgs.follows = "nixpkgs";
treefmt-nix.follows = "treefmt";
};
}; };
dns = { dns = {

View file

@ -0,0 +1,6 @@
-----BEGIN NEBULA CERTIFICATE V2-----
MIGzoE2ACnZwcy1wdWJsaWOhBwQFCv76BBijCAwGc2VydmVyhQRphR5fhgRrKH30
hyAVQ/4ZW6re1yzFagxOA4SEMyUQWl7UCMJuYEUyO3NFaIIgdnIqsdm+3dZlD0Z6
7TObDfl+D6IbW5ATTzxVA8cF+0qDQBE3+pZ54sbLravpoUt01ukqAsHAZ2kuQcrY
DaZgtdjp1z0U7FkdqWAYlNeMVzjyXf4MQQJZH5ANu5tsofRtGw4=
-----END NEBULA CERTIFICATE V2-----

View file

@ -1,6 +0,0 @@
-----BEGIN NEBULA CERTIFICATE V2-----
MIGwoEqAB3Zwcy13d3ehBwQFCv76BBijCAwGc2VydmVyhQRpp1ZvhgRrKH30hyAV
Q/4ZW6re1yzFagxOA4SEMyUQWl7UCMJuYEUyO3NFaIIgdnIqsdm+3dZlD0Z67TOb
Dfl+D6IbW5ATTzxVA8cF+0qDQBO7xSq71ZH/8UCt9HAzBxFDlrigv3cGQUdh/y5B
TIid0k9jdBvoJr2WQbvvUbJeWkRlZbOPMBMUWejgLNXjnww=
-----END NEBULA CERTIFICATE V2-----

View file

@ -93,12 +93,11 @@
bind = CONTROL, Print, exec, grimblast --notify --freeze copysave active bind = CONTROL, Print, exec, grimblast --notify --freeze copysave active
# Special workspaces # Special workspaces
bind = SUPER, Q, togglespecialworkspace, flake
bind = SUPER, S, togglespecialworkspace, music bind = SUPER, S, togglespecialworkspace, music
bind = SUPER, D, togglespecialworkspace, chat bind = SUPER, D, togglespecialworkspace, chat
bind = SUPER, Q, togglespecialworkspace, flake
bind = SUPER, M, togglespecialworkspace, monitor bind = SUPER, M, togglespecialworkspace, monitor
bind = SUPER, F, togglespecialworkspace, files bind = SUPER, F, togglespecialworkspace, files
bind = SUPER, N, togglespecialworkspace, notes
''; '';
}; };
} }

View file

@ -89,12 +89,11 @@
# Large outer gaps on special workspaces # Large outer gaps on special workspaces
"s[true], gapsout:60" "s[true], gapsout:60"
"special:flake, on-created-empty:kitty --directory ~/Projects/nixos-config"
"special:music, on-created-empty:spotify" "special:music, on-created-empty:spotify"
"special:chat, on-created-empty:discord" "special:chat, on-created-empty:discord"
"special:flake, on-created-empty:kitty --directory ~/Projects/nixos-config"
"special:monitor, on-created-empty:kitty btop" "special:monitor, on-created-empty:kitty btop"
"special:files, on-created-empty:nemo" "special:files, on-created-empty:nemo"
"special:notes, on-created-empty:obsidian"
]; ];
exec-once = [ "[workspace special:monitor silent] kitty btop" ]; exec-once = [ "[workspace special:monitor silent] kitty btop" ];