1 Commits

Author SHA1 Message Date
Daniel Olsen
7b72adab7f add consolidation 2023-11-10 20:18:17 +01:00
5 changed files with 27 additions and 20 deletions

28
flake.lock generated
View File

@@ -42,16 +42,16 @@
]
},
"locked": {
"lastModified": 1702676849,
"narHash": "sha256-XqcREaTS38/QOsN8fk8PP325/UXHyF9enbP5ZPw5aiA=",
"lastModified": 1695108154,
"narHash": "sha256-gSg7UTVtls2yO9lKtP0yb66XBHT1Fx5qZSZbGMpSn2c=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "aa99c2f4e9847cbb7e46fac0844ea1eb164b3b3a",
"rev": "07682fff75d41f18327a871088d20af2710d4744",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.11",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
@@ -79,27 +79,27 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1702346276,
"narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=",
"lastModified": 1698942558,
"narHash": "sha256-/UmnB+mEd6Eg3mJBrAgqRcyZX//RSjHphcCO7Ig9Bpk=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7",
"rev": "621f51253edffa1d6f08d5fce4f08614c852d17e",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-23.11",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1702673133,
"narHash": "sha256-WWLJaaCSufoQ4kNyIeKJvEFuAMgCvd9BdBeoJEm7YQ0=",
"lastModified": 1699131694,
"narHash": "sha256-dKWORPD0ODREKihqCZqEqc1zJ3wACmoMmuf2BGg3DbE=",
"owner": "nix-community",
"repo": "NUR",
"rev": "cdf58b69ab208e77fa1d6195983a151c9cd20e9e",
"rev": "6226a48fb329802a63da2babbdd2d375713af333",
"type": "github"
},
"original": {
@@ -120,11 +120,11 @@
},
"unstable": {
"locked": {
"lastModified": 1702539185,
"narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
"lastModified": 1699094435,
"narHash": "sha256-YLZ5/KKZ1PyLrm2MO8UxRe4H3M0/oaYqNhSlq6FDeeA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
"rev": "9d5d25bbfe8c0297ebe85324addcb5020ed1a454",
"type": "github"
},
"original": {

View File

@@ -5,9 +5,9 @@
# nixConfig.exta-trusted-public-keys = "cache.dodsorf.as:FYKGadXTyI2ax8mirBTOjEqS/8PZKAWxiJVOBjESQXc=";
inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
home-manager.url = "github:nix-community/home-manager/release-23.11";
home-manager.url = "github:nix-community/home-manager/release-23.05";
home-manager.inputs.nixpkgs.follows = "nixpkgs";
unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";

View File

@@ -74,7 +74,7 @@ in
ncdu
bat
eza
exa
ripgrep
] ++ lib.optionals cfg.plus [
ffmpeg-full
@@ -282,6 +282,10 @@ in
"gitlab.stud.idi.ntnu.no" = {
proxyJump = "login.pvv.ntnu.no";
};
"consolidation" = {
hostname = "62.92.111.62";
user = "root";
};
};
};

View File

@@ -47,6 +47,8 @@ in
export XDG_CURRENT_DESKTOP=kde
export DESKTOP_SESSION=kde
export QT_STYLE_OVERRIDE="breeze"
'';
windowManager = {
@@ -140,7 +142,7 @@ in
gtk = {
enable = true;
enable = false;
theme = {
package = pkgs.breeze-gtk;
name = "Breeze";
@@ -152,6 +154,7 @@ in
};
qt = {
enable = true;
#useGtkTheme = true;
platformTheme = "gtk";
};

View File

@@ -21,8 +21,8 @@ in
};
shellAliases = {
cat = "bat";
ls = "eza";
tree = "eza -T";
ls = "exa";
tree = "exa -T";
df = "df -h";
sysu = "systemctl --user";